Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 00:10:20 +0000 (16:10 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 28 Jan 2011 00:10:20 +0000 (16:10 -0800)
commit0cee7cee6e91f0cdeebb2e5711287262c7f6c7ec
tree0a1462e1fb87bafc859e8f7bd31e76dc83c45577
parent4ab1a043741c58d3b964c31a70d778c266ffc8bf
parent731e4a31d703226eacf7a84c6afab44e62e58a05
Merge from mainline.